Update Sherpa to v3#10572
Conversation
|
A new Pull Request was created by @shimashimarin for branch IB/CMSSW_17_0_X/master. @akritkbehera, @cmsbuild, @iarspider, @raoatifshad, @smuzaffar can you please review it and eventually sign? Thanks. |
|
cms-bot internal usage |
| @@ -0,0 +1,16 @@ | |||
| ### RPM external libzip 1.11.4 | |||
There was a problem hiding this comment.
@shimashimarin , @akritkbehera already have added libzip (which was needed for xrootd 6.x series) in devel branch https://github.com/cms-sw/cmsdist/blob/IB/CMSSW_17_0_X/devel/libzip.spec . Can you please use https://github.com/cms-sw/cmsdist/blob/IB/CMSSW_17_0_X/devel/libzip.spec so that we do not have to resolve any merge conflicts
| @@ -0,0 +1,10 @@ | |||
| <tool revision="1"> | |||
There was a problem hiding this comment.
@shimashimarin , is sherpa v3 linking against libzip.so? If yes then please add the following here
<lib name="zip"/>
| <environment name="INCLUDE" default="$TOOL_BASE/include"/> | ||
| </client> | ||
| <runtime name="PATH" value="$TOOL_BASE/bin" type="path"/> | ||
| <runtime name="ROOT_INCLUDE_PATH" value="$INCLUDE" type="path"/> |
There was a problem hiding this comment.
ROOT_INCLUDE_PATH should only be added if the headers files of this tool end up in root dictionaries? Do you think that libzip headers will will end up in root dicts generated in cmssw (directly or indirectly via sherpa headers)? If not then please remove this line
|
|
||
| %prep | ||
| %setup -n bzip2-bzip2-%{realversion} | ||
| sed -i 's/-Wl,-soname -Wl,libbz2.so.1.0/-Wl,-soname -Wl,libbz2.so.1/' Makefile-libbz2_so |
There was a problem hiding this comment.
@shimashimarin , I think this is not needed if you use the libzip spec from https://github.com/cms-sw/cmsdist/blob/IB/CMSSW_17_0_X/devel/libzip.spec . @akritkbehera mentioned that if few flags are not explicitly turned OFF for libzip then it picks up system bz2lib and that is why rpm dependnecy fails. Please use the libzip from devel branch and remove this line
There was a problem hiding this comment.
@smuzaffar thanks for you comments. I've update libzip.spec and modified related things accordingly
|
Pull request #10572 was updated. |
|
please test |
|
-1 Failed Tests: Build Failed BuildI found compilation error when building: from /data/cmsbld/jenkins/workspace/ib-run-pr-tests/testBuildDir/el8_amd64_gcc13/external/sherpa/3.0.4-27726c334c06f1346e0aa71297dd8d93/include/SHERPA-MC/ATOOLS/Phys/Blob_List.H:4,
from /data/cmsbld/jenkins/workspace/ib-run-pr-tests/testBuildDir/el8_amd64_gcc13/external/sherpa/3.0.4-27726c334c06f1346e0aa71297dd8d93/include/SHERPA-MC/SHERPA/Main/Filter.H:6,
from /data/cmsbld/jenkins/workspace/ib-run-pr-tests/testBuildDir/el8_amd64_gcc13/external/sherpa/3.0.4-27726c334c06f1346e0aa71297dd8d93/include/SHERPA-MC/SHERPA/Main/Sherpa.H:7,
from src/GeneratorInterface/SherpaInterface/src/SherpaHepMC3Hadronizer.cc:9:
/data/cmsbld/jenkins/workspace/ib-run-pr-tests/testBuildDir/el8_amd64_gcc13/external/sherpa/3.0.4-27726c334c06f1346e0aa71297dd8d93/include/SHERPA-MC/ATOOLS/Phys/Flavour.H: In constructor 'ATOOLS::Particle_Info::Particle_Info()':
/data/cmsbld/jenkins/workspace/ib-run-pr-tests/testBuildDir/el8_amd64_gcc13/external/sherpa/3.0.4-27726c334c06f1346e0aa71297dd8d93/include/SHERPA-MC/ATOOLS/Phys/Flavour.H:27:30: error: 'ATOOLS::Particle_Info::m_radius' will be initialized after [-Werror=reorder]
27 | double m_mass, m_hmass, m_radius, m_yuk, m_width, m_dg, m_dm, m_qoverp2;
| ^~~~~~~~
/data/cmsbld/jenkins/workspace/ib-run-pr-tests/testBuildDir/el8_amd64_gcc13/external/sherpa/3.0.4-27726c334c06f1346e0aa71297dd8d93/include/SHERPA-MC/ATOOLS/Phys/Flavour.H:27:21: error: 'double ATOOLS::Particle_Info::m_hmass' [-Werror=reorder]
27 | double m_mass, m_hmass, m_radius, m_yuk, m_width, m_dg, m_dm, m_qoverp2;
| ^~~~~~~
|
|
@shimashimarin , looks like we need changes in https://github.com/cms-sw/cmssw for new sherpa |
|
yes, the SherpaInterface should be revised. Sherpa v3 is very different from Sherpa v2. I will update SherpaInterface meanwhile |
|
@smuzaffar forget mentioning that, I had another PR for updating SherpaInterface of Sherpa2: cms-sw/cmssw#50955. This is very useful for current Sherpa sample production. If it's merged, I will try to work on Sherpa3 CMSSW interface |
3 participants
Sherpa version 3 have been released last year Sherpa release. This is a big jump of Sherpa version from
v2.2.16tov3.0.4: